Move GtkTranslateFunc to gtktypeutils.h so we can completely deprecate

2008-03-06  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtkitemfactory.h:
    * gtk/gtktypeutils.h:
    Move GtkTranslateFunc to gtktypeutils.h so we can completely
    deprecate gtkitemfactory.h.

    * gtk/gtkactiongroup.h:
    * gtk/gtkstock.h:
    Do not include gtkitemfactory.h directly, instead include gtktypeutils.h

    * README.in:
    Add a note describing this slight incompatible change

svn path=/trunk/; revision=19721

diff --git a/ChangeLog b/ChangeLog
index f0aae5a02ef42ebbfc6b863fef087b67fe113644..e8ed0aa4e1219bab8621ab539b1a886a14d711f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-03-06  Johan Dahlin  <jdahlin@async.com.br>
+
+       * gtk/gtkitemfactory.h:
+       * gtk/gtktypeutils.h:
+       Move GtkTranslateFunc to gtktypeutils.h so we can completely
+       deprecate gtkitemfactory.h. 
+
+       * gtk/gtkactiongroup.h:
+       * gtk/gtkstock.h:
+       Do not include gtkitemfactory.h directly, instead include gtktypeutils.h
+
+       * README.in: 
+       Add a note describing this slight incompatible change
+       
 2008-03-06  Johan Dahlin  <johan@gnome.org>
 
        * gtk/gtkpreview.h: Avoid double-deprecation.

diff --git a/README.in b/README.in
index ffb8d14f02f59e81fa66f7d952c1abc6e8272ba5..0dd988215b10076c5a100a3b759bc0a829784f3e 100644 (file)
--- a/README.in
+++ b/README.in
@@ -27,6 +27,14 @@ Installation
 See the file 'INSTALL'
 
 
+Release notes for 2.14
+======================
+
+* gtkitemfactory.h is now completely deprecated.
+  gtkactiongroup.h and gtkstock.h is no longer included it's header,
+  this might break application using gtk_item_factory_* symbols without
+  including gtkitemfactory.h which has never been supported.
+
 Release notes for 2.12
 ======================
 

diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 0f5df5942daf74e7f666794d036a5e52522ee357..73e9c43e79941576ff8b3fe01c44a297007245bb 100644 (file)
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -31,7 +31,7 @@
 #define __GTK_ACTION_GROUP_H__
 
 #include <gtk/gtkaction.h>
-#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
+#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index 6f3c438b78099155b1e73964763c14732560b33f..bf301f9ccef4e23174afa46d625b523719626deb 100644 (file)
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -27,6 +27,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_ITEM_FACTORY_H__
 #define        __GTK_ITEM_FACTORY_H__
 
@@ -35,11 +37,6 @@
 
 G_BEGIN_DECLS
 
-typedef gchar * (*GtkTranslateFunc)       (const gchar         *path,
-                                           gpointer             func_data);
-
-#if !defined (GTK_DISABLE_DEPRECATED)
-
 typedef void   (*GtkPrintFunc)            (gpointer             func_data,
                                            const gchar         *str);
 /* We use () here to mean unspecified arguments. This is deprecated

diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index f4d0e3ac3255a3a527619aab5f037fbee52d1bc7..52571477ed82a1ed24a50c6c9855d40cbd318a70 100644 (file)
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -29,7 +29,7 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
+#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 90b97ab180391665d3865888a82460f33636126c..e0fd6ab933793815bed498108c51024702984c28 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -122,6 +122,13 @@ typedef void (*GtkCallbackMarshal)  (GtkObject    *object,
                                     guint         n_args,
                                     GtkArg       *args);
 typedef void (*GtkSignalFunc)       (void);
+
+/* This used to be defined in gtkitemfactory.h, but moved over here after
+ * the complete deprecation of that header
+ */
+typedef gchar * (*GtkTranslateFunc) (const gchar  *path,
+                                    gpointer      func_data);
+
 #define GTK_SIGNAL_FUNC(f)         ((GtkSignalFunc) (f))
 
 #ifndef GTK_DISABLE_DEPRECATED